gitweb / test / file with spaceson commit merge-file: support -p and -q; fix compile warnings (fbe0b24)
   1This
   2filename
   3contains
   4spaces.